auto merge of #219 : alexcrichton/cargo/update-to-mater, r=burningtree
authorbors <bors@rust-lang.org>
Fri, 18 Jul 2014 14:41:19 +0000 (14:41 +0000)
committerbors <bors@rust-lang.org>
Fri, 18 Jul 2014 14:41:19 +0000 (14:41 +0000)

Trivial merge